internal/telemetry: export Products field (DataDog#2500)

bendiknesbo · Jan 11, 2024 · 7d7770f · 7d7770f
1 parent 8de8527
commit 7d7770f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/ddtrace/opentelemetry/span_test.go b/ddtrace/opentelemetry/span_test.go
@@ -65,8 +65,6 @@ func waitForPayload(ctx context.Context, payloads chan string) (string, error) {
 }
 
 func TestSpanResourceNameDefault(t *testing.T) {
- t.Skip("Currently broken on CI, but passes locally. Tracking issue: https://github.com/DataDog/dd-trace-go/issues/2499")
-
  assert := assert.New(t)
  ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
  defer cancel()

diff --git a/internal/telemetry/message.go b/internal/telemetry/message.go
@@ -168,7 +168,7 @@ func BoolConfig(key string, val bool) Configuration {
 
 // ProductsPayload is the top-level key for the app-product-change payload.
 type ProductsPayload struct {
- Products `json:"products"`
+ Products Products `json:"products"`
 }
 
 // Products specifies information about available products.

diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go
@@ -74,9 +74,9 @@ func (c *client) productChange(namespace Namespace, enabled bool) {
  products := new(ProductsPayload)
  switch namespace {
  case NamespaceAppSec:
- products.AppSec = ProductDetails{Enabled: enabled}
+ products.Products.AppSec = ProductDetails{Enabled: enabled}
  case NamespaceProfilers:
- products.Profiler = ProductDetails{Enabled: enabled}
+ products.Products.Profiler = ProductDetails{Enabled: enabled}
  case NamespaceTracers:
  // Nothing to do
  default:

diff --git a/internal/telemetry/telemetry_test.go b/internal/telemetry/telemetry_test.go
@@ -30,7 +30,7 @@ func TestProductEnabled(t *testing.T) {
 
  assert.Equal(t, RequestTypeAppProductChange, body.RequestType)
  var productsPayload = body.Payload.(*ProductsPayload)
- assert.True(t, productsPayload.Profiler.Enabled)
+ assert.True(t, productsPayload.Products.Profiler.Enabled)
 }
 
 func TestConfigChange(t *testing.T) {