Merge branch 'main' into jmacd/all_sdkapi

open-telemetry · Oct 7, 2021 · d3d193a · d3d193a
2 parents af6af9e + 3d4ae8d
commit d3d193a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -109,7 +109,7 @@ jobs:
   compatibility-test:
     strategy:
       matrix:
-        go-version: [1.16, 1.15]
+        go-version: [1.17, 1.16, 1.15]
         os: [ubuntu-latest, macos-latest, windows-latest]
         # GitHub Actions does not support arm* architectures on default
         # runners. It is possible to acomplish this with a self-hosted runner

diff --git a/README.md b/README.md
@@ -34,14 +34,19 @@ This project is tested on the following systems.
 
 | OS      | Go Version | Architecture |
 | ------- | ---------- | ------------ |
+| Ubuntu  | 1.17       | amd64        |
 | Ubuntu  | 1.16       | amd64        |
 | Ubuntu  | 1.15       | amd64        |
+| Ubuntu  | 1.17       | 386          |
 | Ubuntu  | 1.16       | 386          |
 | Ubuntu  | 1.15       | 386          |
+| MacOS   | 1.17       | amd64        |
 | MacOS   | 1.16       | amd64        |
 | MacOS   | 1.15       | amd64        |
+| Windows | 1.17       | amd64        |
 | Windows | 1.16       | amd64        |
 | Windows | 1.15       | amd64        |
+| Windows | 1.17       | 386          |
 | Windows | 1.16       | 386          |
 | Windows | 1.15       | 386          |
 

diff --git a/internal/metric/registry/registry.go b/internal/metric/registry/registry.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package registry // import "go.opentelemetry.io/otel/metric/registry"
+package registry // import "go.opentelemetry.io/otel/internal/metric/registry"
 
 import (
 	"context"