From d65aa65729eddf27a44a7fdc496f186f15dc3e42 Mon Sep 17 00:00:00 2001
From: Michael Aaron Safyan <michaelsafyan@google.com>
Date: Wed, 29 May 2024 17:17:24 -0400
Subject: [PATCH] Remove non-GCP attributes from the scope.

---
 .chloggen/gcp-client-libraries.yaml           |  4 ++--
 model/registry/instrumentation.yaml           | 23 -------------------
 model/trace/instrumentation/gcp-client.yml    |  5 +++-
 .../trace/instrumentation/instrumentation.yml | 13 -----------
 4 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 model/registry/instrumentation.yaml
 delete mode 100644 model/trace/instrumentation/instrumentation.yml

diff --git a/.chloggen/gcp-client-libraries.yaml b/.chloggen/gcp-client-libraries.yaml
index 693031422d..0ae23ba749 100755
--- a/.chloggen/gcp-client-libraries.yaml
+++ b/.chloggen/gcp-client-libraries.yaml
@@ -1,4 +1,4 @@
 change_type: 'enhancement'
-component: instrumentation, gcp
-note: Introduced `gcp.client.service` and 'instrumentation.source.*' attributes.
+component: gcp
+note: Introduces `gcp.client.service` scope attribute.
 issues: [ 1047 ]
diff --git a/model/registry/instrumentation.yaml b/model/registry/instrumentation.yaml
deleted file mode 100644
index 2f4c4a50b9..0000000000
--- a/model/registry/instrumentation.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-groups:
-- id: registry.instrumentation
-  prefix: instrumentation
-  type: attribute_group
-  brief: >
-    Describes the instrumentation library - the original library if it's instrumented natively or the instrumentation library.
-  attributes:
-    - id: source.repo
-      type: string
-      stability: experimental
-      brief: The repository associated with the InstrumentationScope.
-      examples: [github.com/organization/repo, gitlab.com/group/repo]
-    - id: source.target
-      type: string
-      stability: experimental
-      brief: The build target associated with the InstrumentationScope.
-      examples: ['//in/bazel/path/to/my/folder:target', 'inGradleYourLib']
-      note: >
-        Particularly useful if the InstrumentationScope library cannot be
-        triangulated from the name and `instrumenation.source.repo` alone.
-        If multiple build targets produce the same result, choose the
-        narrowest possible target (e.g. for Make: "mylib" rather than "all";
-        for Bazel: "//path/to/specific:target", not "//path/..."; etc.).
diff --git a/model/trace/instrumentation/gcp-client.yml b/model/trace/instrumentation/gcp-client.yml
index a748e1b9a5..1c6cc2480e 100644
--- a/model/trace/instrumentation/gcp-client.yml
+++ b/model/trace/instrumentation/gcp-client.yml
@@ -6,4 +6,7 @@ groups:
   stability: experimental
   attributes:
   - ref: gcp.client.service
-    requirement_level: opt_in
+    requirement_level:
+      conditionally_required:
+        Required if and only if the instrumentation library is an official,
+        Google-provided GCP and/or Firebase client library.
diff --git a/model/trace/instrumentation/instrumentation.yml b/model/trace/instrumentation/instrumentation.yml
deleted file mode 100644
index a9aa24e9b5..0000000000
--- a/model/trace/instrumentation/instrumentation.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-groups:
-- id: instrumentation.scope
-  type: scope
-  brief: >
-    The `instrumentation` conventions are intended to provide common
-    mechanisms for triangulating and identifying instrumentation libraries.
-  prefix: instrumentation
-  stability: experimental
-  attributes:
-  - ref: instrumentation.source.repo
-    requirement_level: opt_in
-  - ref: instrumentation.source.target
-    requirement_level: opt_in