From 72c29aa887517dcebc4b47a3d9fbb3ce3ac78450 Mon Sep 17 00:00:00 2001
From: niksajakovljevic <niksa.jakovljevic@gmail.com>
Date: Thu, 20 Oct 2022 11:14:53 +0200
Subject: [PATCH] Prepare for 0.16.0 release

---
 .github/workflows/go-scheduled.yml | 3 ---
 CHANGELOG.md                       | 7 +++++--
 Makefile                           | 3 +--
 pkg/version/version.go             | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/go-scheduled.yml b/.github/workflows/go-scheduled.yml
index 547ae80421..c6fc6e35a2 100644
--- a/.github/workflows/go-scheduled.yml
+++ b/.github/workflows/go-scheduled.yml
@@ -65,8 +65,5 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-
 
-    - name: Test
-      run: make test
-
     - name: Test extended dataset
       run: go test -v -race -timeout=30m ./pkg/tests/end_to_end_tests/ -extended-test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 870f350b85..a2f992cdea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,10 @@ We use the following categories for changes:
 
 ## Unreleased
 
+## [0.16.0] - 2022-10-20
+
 ### Added
+- Integration tests to qualify as certified Jaeger remote storage [#1686]
 
 ### Changed
 
@@ -26,8 +29,8 @@ We use the following categories for changes:
   references in Jaeger) for traces with more than one event and one link.
 - Fix incorrect reference types when retrieving Jaeger traces with multiple
   parent references [#1681].
-- Fix incorrect population of span kind field in jaeger getOperations response [#162
-]
+- Fix incorrect population of span kind field in jaeger getOperations response [#1686]
+- Improved query performance when getting trace by id [#1626]
 
 ## [0.15.0] - 2022-10-11
 
diff --git a/Makefile b/Makefile
index 0bc5588fe1..404a88cbe7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ LOCAL_DOCKER_BASE := local/dev_promscale_extension
 GHCR_DOCKER_BASE := ghcr.io/timescale/dev_promscale_extension
 MDOX_BIN=mdox
 MDOX_VALIDATE_CONFIG=
-CURRENT_BRANCH?=$(shell git branch --show-current | sed 's#/#-#')
+CURRENT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
 EXTENSION_VERSION=$(shell cat EXTENSION_VERSION | tr -d '[:space:]')
 
 
@@ -31,7 +31,6 @@ pkg/tests/testdata/traces-dataset.sz:
 e2e: DOCKER_IMAGE?=$(shell ./scripts/fallback-docker.sh $(LOCAL_DOCKER_BASE):head-ts2-pg14 $(GHCR_DOCKER_BASE):$(CURRENT_BRANCH)-ts2-pg14 $(GHCR_DOCKER_BASE):$(EXTENSION_VERSION)-ts2-pg14)
 e2e: pkg/tests/testdata/traces-dataset.sz generate
 	go test -v ./pkg/tests/end_to_end_tests/ -timescale-docker-image=$(DOCKER_IMAGE)
-	go test -v ./pkg/tests/end_to_end_tests/ -use-timescaledb=false -timescale-docker-image=$(DOCKER_IMAGE)
 	# TODO: Skipping multinode because tests are broken for now
 	# go test -v ./pkg/tests/end_to_end_tests/ -use-multinode -timescale-docker-image=$(DOCKER_IMAGE)
 
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 14e1031626..f9a148f0e7 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -38,7 +38,7 @@ var (
 	// It is customary to bump the version by incrementing the numeral after
 	// the `dev` tag. The SQL migration script name must correspond to the /new/ version.
 
-	Promscale                  = "0.16.0-dev"
+	Promscale                  = "0.16.0"
 	PrevReleaseVersion         = "0.15.0"
 	CommitHash                 = ""      // Comes from -ldflags settings
 	Branch                     = ""      // Comes from -ldflags settings