From 0fc0a84ada89f9b164ec35440ff4872acc95b1e7 Mon Sep 17 00:00:00 2001 From: "Jerry J. Harrow" <84593277+jerryharrow@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:19:45 -0400 Subject: [PATCH 1/3] docs: Updates for ROCm support with Slurm (FOUNDENG-128) Provide doc updates with minor tweaks to cover slot_type: rocm on Slurm. Describe env inheritance with Podman. Updates the launcher version for the latest matching behavior. --- .../sysadmin-deploy-on-slurm/install-on-slurm.rst | 7 ++++++- .../slurm-known-issues.rst | 14 ++++++++++++++ .../config/master-config-reference.rst | 14 +++++++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/install-on-slurm.rst b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/install-on-slurm.rst index 4bd033ac35e..e9629b4a07a 100644 --- a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/install-on-slurm.rst +++ b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/install-on-slurm.rst @@ -63,6 +63,7 @@ fulfilled and configured, install and configure the Determined master: job_storage_root: path: tres_supported: true + slot_type: cuda #. The installer provides default values, however, you should explicitly configure the following cluster options: @@ -175,8 +176,12 @@ recommended to optimize how Determined interacts with Slurm: Determined maps Slurm partitions to Determined resource pools. It is recommended that the nodes within a partition are homogeneous for Determined to effectively schedule GPU jobs. - - A Slurm partition with GPUs is identified as a CUDA resource pool. + - A Slurm partition with GPUs is identified as a CUDA/ROCM resource pool. The type is inherited + from the ``resource_manager.slot_type`` configuration. It can be also be specified-per + partition using ``resource_manager.partition_overrides`` + - A Slurm partition with no GPUs is identified as an AUX resource pool. + - The Determined default resource pool is set to the Slurm default partition. - Tune the Slurm configuration for Determined job preemption. diff --git a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/slurm-known-issues.rst b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/slurm-known-issues.rst index b5818459113..59c0022e50d 100644 --- a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/slurm-known-issues.rst +++ b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/slurm-known-issues.rst @@ -120,6 +120,20 @@ Some constraints are due to differences in behavior between Docker and Singulari #. Ensure that the names and addresses of the login node, admin node, and all compute nodes are consistently available in ``/etc/hosts`` on all nodes. + - Podman containers only inherit environment variables that have been explicitly specified. + Determined adds Podman arguments to provide any Determined-configured environment variables, + and the launcher enables inheritance of the following variables: ``SLURM_*``, + ``CUDA_VISIBLE_DEVICES``, ``NVIDIA_VISIBLE_DEVICES``, ``ROCR_VISIBLE_DEVICES``, + ``HIP_VISIBLE_DEVICES``. You may enable the inheritance of additional variables from the host + environment by specifying the variable name with an empty value in the + ``environment_variables`` of your experiment configuration or :ref:`task container defaults + `. + + .. code:: yaml + + environment_variables: + - INHERITED_ENV_VAR= + *********************** AMD/ROCm Known Issues *********************** diff --git a/docs/reference/reference-deploy/config/master-config-reference.rst b/docs/reference/reference-deploy/config/master-config-reference.rst index 97756620647..82f3fe3cd99 100644 --- a/docs/reference/reference-deploy/config/master-config-reference.rst +++ b/docs/reference/reference-deploy/config/master-config-reference.rst @@ -250,9 +250,17 @@ The master supports the following configuration settings: is started. - ``slot_type``: The default slot type assumed when users request resources from Determined - in terms of ``slots``. Available values are ``cuda`` and ``cpu``, where 1 ``cuda`` slot is - 1 GPU and 1 ``cpu`` slot is 1 node. Defaults per partition to ``cuda`` if GPU resources are - found within the partition, else ``cpu``. + in terms of ``slots``. Defaults to ``cuda``. + + - ``slot_type: cuda``: One NVIDIA GPU will be requested per compute slot. Partitions which + contain one or more GPUs will default to resource pool with slot type ``cuda``. + + - ``slot_type: rocm``: One AMD GPU will be requested per compute slot. Partitions which + contain one or more GPUs will default to resource pool with slot type ``rocm``. + + - ``slot_type: cpu``: CPU resources will be requested for each compute slot. Partitions + which contain no GPUs will defalt to a resource pool with slot type ``cpu``. One node + will be allocated per slot. - ``rendezvous_network_interface``: The interface used to bootstrap communication between distributed jobs. For example, when using horovod the IP address for the host on this From b636f7c6c818027741620ace5d55d38605b24a8b Mon Sep 17 00:00:00 2001 From: "Jerry J. Harrow" <84593277+jerryharrow@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:19:45 -0400 Subject: [PATCH 2/3] docs: Updates for ROCm support with Slurm (FOUNDENG-128) Provide doc updates with minor tweaks to cover slot_type: rocm on Slurm. Describe env inheritance with Podman. Updates the launcher version for the latest matching behavior. --- .../sysadmin-deploy-on-slurm/overview.rst | 2 +- .../config/master-config-reference.rst | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/overview.rst b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/overview.rst index 9ba67818b6a..898b857028a 100644 --- a/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/overview.rst +++ b/docs/cluster-setup-guide/deploy-cluster/sysadmin-deploy-on-slurm/overview.rst @@ -12,7 +12,7 @@ +----------------------+ | Launcher | | (`hpe-hpc-launcher`) | -| >= 3.0.19 | +| >= 3.1.0 | +----------------------+ | Java >= 1.8 | +----------------------+ diff --git a/docs/reference/reference-deploy/config/master-config-reference.rst b/docs/reference/reference-deploy/config/master-config-reference.rst index 82f3fe3cd99..37a51973978 100644 --- a/docs/reference/reference-deploy/config/master-config-reference.rst +++ b/docs/reference/reference-deploy/config/master-config-reference.rst @@ -252,14 +252,16 @@ The master supports the following configuration settings: - ``slot_type``: The default slot type assumed when users request resources from Determined in terms of ``slots``. Defaults to ``cuda``. - - ``slot_type: cuda``: One NVIDIA GPU will be requested per compute slot. Partitions which - contain one or more GPUs will default to resource pool with slot type ``cuda``. + - ``slot_type: cuda``: One NVIDIA GPU will be requested per compute slot. Any partitions + with GPUs will be represented as a resource pool with slot type ``cuda`` which can be + overridden using ``partition_overrides``. - - ``slot_type: rocm``: One AMD GPU will be requested per compute slot. Partitions which - contain one or more GPUs will default to resource pool with slot type ``rocm``. + - ``slot_type: rocm``: One AMD GPU will be requested per compute slot. Any partitions with + GPUs will be represented as a resource pool with slot type ``rocm`` which can be + overridden using ``partition_overrides``. - ``slot_type: cpu``: CPU resources will be requested for each compute slot. Partitions - which contain no GPUs will defalt to a resource pool with slot type ``cpu``. One node + that contain no GPUs will default to a resource pool with slot type ``cpu``. One node will be allocated per slot. - ``rendezvous_network_interface``: The interface used to bootstrap communication between From bfdc7db11ab2aa0a4b65e3e3da84801fc02194e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 02:21:43 +0000 Subject: [PATCH 3/3] build(deps): bump go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho Bumps [go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho](https://github.com/labstack/echo) from 0.29.0 to 0.35.0. - [Release notes](https://github.com/labstack/echo/releases) - [Changelog](https://github.com/labstack/echo/blob/master/CHANGELOG.md) - [Commits](https://github.com/labstack/echo/commits) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- master/go.mod | 17 ++++++++--------- master/go.sum | 32 +++++++++++++++++--------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/master/go.mod b/master/go.mod index f20a38f9ded..ec846783dd0 100644 --- a/master/go.mod +++ b/master/go.mod @@ -9,7 +9,6 @@ require ( github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/davecgh/go-spew v1.1.1 - github.com/determined-ai/determined/proto v0.0.0-00010101000000-000000000000 github.com/docker/docker v20.10.12+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 @@ -21,7 +20,7 @@ require ( github.com/go-pg/pg/v10 v10.10.6 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang/protobuf v1.5.2 - github.com/google/go-cmp v0.5.7 + github.com/google/go-cmp v0.5.8 github.com/google/uuid v1.3.0 github.com/gorilla/websocket v1.4.2 github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 @@ -34,7 +33,7 @@ require ( github.com/jackc/pgx/v4 v4.12.0 github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 github.com/labstack/echo-contrib v0.11.0 - github.com/labstack/echo/v4 v4.6.3 + github.com/labstack/echo/v4 v4.9.0 github.com/labstack/gommon v0.3.1 github.com/o1egl/paseto v1.0.0 github.com/opencontainers/go-digest v1.0.0 // indirect @@ -48,7 +47,7 @@ require ( github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.9.0 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 github.com/uber/jaeger-client-go v2.25.0+incompatible github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 @@ -66,8 +65,8 @@ require ( ) require ( - go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.29.0 - go.opentelemetry.io/otel v1.6.1 + go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.35.0 + go.opentelemetry.io/otel v1.10.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1 go.opentelemetry.io/otel/sdk v1.6.1 @@ -132,7 +131,7 @@ require ( github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect github.com/uber/jaeger-lib v2.4.0+incompatible // indirect @@ -144,7 +143,7 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 // indirect - go.opentelemetry.io/otel/trace v1.6.1 // indirect + go.opentelemetry.io/otel/trace v1.10.0 // indirect go.opentelemetry.io/proto/otlp v0.12.1 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect @@ -158,7 +157,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.63.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect k8s.io/klog/v2 v2.30.0 // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect diff --git a/master/go.sum b/master/go.sum index 88610d68eb7..98c615c12e8 100644 --- a/master/go.sum +++ b/master/go.sum @@ -315,8 +315,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -524,8 +525,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/labstack/echo-contrib v0.11.0 h1:/B7meUKBP7AAoSEOrawpSivhFvu7GQG+kDhlzi5v0Wo= github.com/labstack/echo-contrib v0.11.0/go.mod h1:Hk8Iyxe2GrYR/ch0cbI3BK7ZhR2Y60YEqtkoZilqDOc= github.com/labstack/echo/v4 v4.3.0/go.mod h1:PvmtTvhVqKDzDQy4d3bWzPjZLzom4iQbAZy2sgZ/qI8= -github.com/labstack/echo/v4 v4.6.3 h1:VhPuIZYxsbPmo4m9KAkMU/el2442eB7EBFFhNTTT9ac= -github.com/labstack/echo/v4 v4.6.3/go.mod h1:Hk5OiHj0kDqmFq7aHe7eDqI7CUhuCrfpupQtLGGLm7A= +github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY= +github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= @@ -751,16 +752,18 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -819,14 +822,13 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.29.0 h1:BLXo2v0bW3iq8NhgSf/1X6Cu7UcfkNk3yyuxNcZB1wk= -go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.29.0/go.mod h1:+0RWgKCuTYtJaZo9Io/D2PAvkMZsRkmYaNgHhwzrCDM= -go.opentelemetry.io/contrib/propagators/b3 v1.4.0 h1:wDb2ct7xMzossYpx44w81skxkEyeT2IRnBgYKqyEork= -go.opentelemetry.io/contrib/propagators/b3 v1.4.0/go.mod h1:K399DN23drp0RQGXCbSPOt9075HopQigMgUL99oR8hc= +go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.35.0 h1:JSRENX7wo6sCwG0yKn0vFhJ1TexUEnYrSQCQby5bRDA= +go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.35.0/go.mod h1:sCWSENooWFSW7x/PzXiejBjDMrzifVbqN8FbtYYCydc= +go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= -go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.6.1 h1:6r1YrcTenBvYa1x491d0GGpTVBsNECmrc/K6b+zDeis= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= +go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= +go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 h1:T1FtMXHM2YPIUrYxSbTIAYDCvUZVpNdl7hDMDnp09cE= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1 h1:EvIC2jmn1+24OABwtw2Lng5yxy5eYJ8nf461UaHXTms= @@ -835,9 +837,9 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1 h1:G45R6K go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM= go.opentelemetry.io/otel/sdk v1.6.1 h1:ZmcNyMhcuAYIb/Nr6QhBPTMopMTbov/47wHt1gibkoY= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.6.1 h1:f8c93l5tboBYZna1nWk0W9DYyMzJXDWdZcJZ0Kb400U= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= +go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= +go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.12.1 h1:kfx2sboxOGFvGJcH2C408CiVo2wVHC2av2XHNqj4vEg= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= @@ -978,7 +980,6 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1384,8 +1385,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=